Don't potentitally double-quote icons in KML writer.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4413 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index c4dc0ab30ebf51a7358e5fa5f7182aa85682bc77..d62b822265b2b91cd9a2ae1c64aac718329397a5 100644 (file)
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -1548,15 +1548,11 @@ static void kml_waypt_pr(const waypoint* waypointp)
   if (waypointp->hasLink()) {
     writer->writeEmptyElement("snippet");
     if (waypointp->hasLinkText()) {
-      // FIXME(robertlipe): these call to xml_entitize are suspicios with 
-      // new XML serializer.
-      char* odesc = xml_entitize(waypointp->url.toUtf8().data());
-      char* olink = xml_entitize(waypointp->url_link_text.toUtf8().data());
+      QString odesc = waypointp->url;
+      QString olink = waypointp->url_link_text;
       writer->writeStartElement("description");
       writer->writeCDATA(QString("<a href=\"%1\">%2</a>").arg(odesc, olink));
       writer->writeEndElement(); // Close description tag
-      xfree(olink);
-      xfree(odesc);
     } else {
       writer->writeTextElement("description", waypointp->url);
     }
@@ -1575,7 +1571,7 @@ static void kml_waypt_pr(const waypoint* waypointp)
     writer->writeStartElement("Style");
     writer->writeStartElement("IconStyle");
     writer->writeStartElement("Icon");
-    writer->writeTextElement("href", icon.toUtf8().data());
+    writer->writeTextElement("href", icon);
     writer->writeEndElement(); // Close Icon tag
     writer->writeEndElement(); // Close IconStyle tag
     writer->writeEndElement(); // Close Style tag